Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 25 Jul 2011 16:41:39 +0000 (09:41 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 25 Jul 2011 16:41:39 +0000 (09:41 -0700)
commitf9b6de1c3892f7477be7711bf88302f6dc70c1a2
tree294aea5835528c6e65395d3ed953026a58b9f3ba
parent93ee2e62e51f4f6d30ac999edec02a30ca9e43a2
parentcddaabd2174633ef0ba9b956448e25aa9e4417c5
Merge from trunk.
src/ChangeLog